Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 7 Mar 2010 11:51:19 +0000 (11:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 7 Mar 2010 11:51:19 +0000 (11:51 +0000)

Trivial merge